From 87c45c73b18889b902d2bdda99bdca57059ba1a9 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 10 Feb 2004 18:29:11 +0000 Subject: [PATCH] Fixes the entry-related part of #133852. 2004-02-10 Federico Mena Quintero Fixes the entry-related part of #133852. * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change the file part of the entry if the selected item is a folder. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkfilechooserdefault.c | 5 +++-- 6 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index abc1f0d12d..3f72b5076c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-02-10 Federico Mena Quintero + + Fixes the entry-related part of #133852. + + * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change + the file part of the entry if the selected item is a folder. + 2004-02-10 Federico Mena Quintero Fixes #133995, patch by Morten Welinder . diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index abc1f0d12d..3f72b5076c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-02-10 Federico Mena Quintero + + Fixes the entry-related part of #133852. + + * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change + the file part of the entry if the selected item is a folder. + 2004-02-10 Federico Mena Quintero Fixes #133995, patch by Morten Welinder . diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index abc1f0d12d..3f72b5076c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2004-02-10 Federico Mena Quintero + + Fixes the entry-related part of #133852. + + * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change + the file part of the entry if the selected item is a folder. + 2004-02-10 Federico Mena Quintero Fixes #133995, patch by Morten Welinder . diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index abc1f0d12d..3f72b5076c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-02-10 Federico Mena Quintero + + Fixes the entry-related part of #133852. + + * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change + the file part of the entry if the selected item is a folder. + 2004-02-10 Federico Mena Quintero Fixes #133995, patch by Morten Welinder . diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index abc1f0d12d..3f72b5076c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-02-10 Federico Mena Quintero + + Fixes the entry-related part of #133852. + + * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change + the file part of the entry if the selected item is a folder. + 2004-02-10 Federico Mena Quintero Fixes #133995, patch by Morten Welinder . diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 7d742f6d49..f00a5a2847 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2106,8 +2106,9 @@ update_chooser_entry (GtkFileChooserDefault *impl) info = _gtk_file_system_model_get_info (impl->list_model, &child_iter); - _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->entry), - gtk_file_info_get_display_name (info)); + if (!gtk_file_info_get_is_folder (info)) + _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->entry), + gtk_file_info_get_display_name (info)); } static void -- 2.30.2